projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a97fce7 aa1d7dd)
Merge from origin/emacs-28
authorStefan Kangas <stefan@marxist.se>
Thu, 2 Dec 2021 16:34:10 +0000 (17:34 +0100)
committerStefan Kangas <stefan@marxist.se>
Thu, 2 Dec 2021 16:34:10 +0000 (17:34 +0100)
aa1d7dd867 ; * etc/AUTHORS: Update.
6294e60205 ; * admin/authors.el (authors-aliases): More fixes.
40fc31ea28 ; * ChangeLog.3: Update.
2be090d5d3 ; * ChangeLog.3: Minor fixes.
9963b11bf7 ; * admin/authors.el (authors-aliases): Further updates.
50b40e1d4f ; * lisp/org/ob-julia.el: Fix Author header for authors.el.
84166ea2e6 CC Mode: Recognise "struct foo {" as introducing a type de...

1  2 
admin/authors.el patch | diff1 | diff2 | blob | history
lisp/progmodes/cc-engine.el patch | diff1 | diff2 | blob | history

diff --cc admin/authors.el
Simple merge
diff --cc lisp/progmodes/cc-engine.el
Simple merge
Unnamed repository; edit this file 'description' to name the repository.